Cleaned up code some more

Cleaned up the code some more.