cleanup
slight refactor