Cleaned up the code slightly
Cleaned up code