reverting various things so tests pass and formatting looks better
fix comparison
The Refactorer(TM)