General cleanup (formatting+whitespace)