Remove whitespace and improve naming