Updated Main

Cleaned up some code and some ideas I had instilled.