chore(style): code style changes

Replaced single line if statements with curly wrapped statements

Replaced line expressions with if statements

Uniformized line lengths to 80 characters

Made if( to if ( for consistency