Differentiation between methods and getters / setters & cleanup

Differentiation between methods and getters / setters & added (get | set) prefix to them. 
Rearranged static assignment.