Comment out unused code for now
Wrap conditionals in parens
Rename id selectors