Cleaned up a bit
Cleaned up a bit