initial commit
some formatting
minor cleanup