Made the following changes: Removed class, standardised property names to camel case and switched method names.