Initial commit
some cleanup