Renamed static object mixins and fixed some whitespace