Update if else brackets, and public/private variable naming