Cleaning up as to prep for bigger changes