Cleaned up code a bit
Cleaned up the code a bit