Removed the guards because it seems most compilers don't have those anyway.
Removed unnecassary spaces around the function calls.