Remove commented-out lines
Refactor code