Changed all one line ifs and elses to use block style braces