updates to adhere to PSR-2 coding standard, biggest change - method names camelCase