Initial commit
Some cleanup