Change class instantiation to run initializer
Extract the decorator mixin into its own file