Name cleanup
Add plain object approach until I can decide which approach to go with