completed removal of misuse of defined preprocessor keyword