Cleaning up

Cleaning up code before merging the files