Switch from 4 spaces to 2 for indentation
Clean-up: Add brackets to variables