Cleaning up some trailing whitespace
More whitespace
More best practics stuff
Removed empty helper files