Cleaned up Code

Cleaned up Code