Minor spacing & variable fixes