refactored some setters to static variables

* Cleaned up methods
* Tests still green