Cleaning up

code spring cleaning time