* Fixing refactoring bugs - I was trying to be too smart
* throws in their own line