PR changes: method codestyle, and file location as property