Cleaning Up

Cleaning up the code.