Clean up whitespace and margins