cleanup and switching to properties over private variables and methods