Initial commit, minor cleanup