Cleaned Code

Cleaned up the previous code.