Refactoring.

Made some getters and setters from methods.
Converted some static classes to enums.