cleaning the house up
minor reorganization