Cleanup and formatting
Renaming foundation custom to foundation