Revert blank line changes, remove comments