refactoring pt 1
finishing refactoring
more refactoring and cleanup
more refactoring