Commented-out code and whitespace cleanup