Cleaning Code

Cleaning up code.