Removed empty statements, added braces for if statements.