Better variables, spacing