Consistent spacing + remove redundant whitespace