Cleaned up the code some

Removed stuff I had commented out and parts that were not necessary