tidy up formatting & variable name