Made variable & method names consistently camel-case