Take the chance to cleanup whitespace and indent