cleaned up a bit
Cleaned up