Cleaning

Cleaned up the code