More coding style (setters getters removed)