Fix up whitespace and make indentation consistent