Cleaned up some basic functions and made get/set public