fixed linewith and some spaces, also remove braces for single line if statements