Cleaned up code
Cleaned up Code