General Cleanup

I went through the project and did some general cleanup to the best of my abilities. I am not 100% done yet and will continue doing cleanup a bit longer.