More whitespace and general cleaning