Cleaning up code

Cleaning up code