Cleanup: Set the attributes on object creation

Code is easier to understand this way.
Cleanup: Remove another unnecessary class
Cleanup: Set the attributes in object creation
Cleanup: Set more attributes on object creation