More cleanup. Beautify!

Package-Manager: portage-2.2.0_alpha177