Initial commit
Cleaning up