Beautify and fix some leftovers