Cleanup formatting, sorting and visibility of methods. Unify clear warnings.