Just some general clean up and getting things in order before we start creating issues