Code Clean Up

Cleaned up some code after competition.