cleaned up custom objects
Cleaning up functions \formatting
formatting changes