Clean up
Better function names
Clean up