Cleaned up Code

...