refactored some minor things