Codestyle
Updated to property getters/setters