Fixed some whitespace
Renamed files to show origin better
Removed unused function