Cleaned up classes

Replaced global variables with getters and setters