Updated to "object" naming convention
Tidied up layout