White-space changes - code was in parts unreadable after tab/spaces
conversion. While at it, removed a few lines of commented-out code.