first commit
minor
cleanup