Added braces and improved preprocessor performance