Cleaning commented-out code, minor polishing