refactoring
first commit, did this a while back