Initial commit beautified