some refactorin, some stylin, some cleanin