Cleanup
Fixes
Renamed function