cleaned up

Finished with cleanup