Cleanup: Components and Objects

Closes:
- #44 
- #43 

Affects:
- #36