Cleaned up a lot of things
Even more cleaning