Cleaned up Code
Cleaned code