Initial commit
First cleanup