Added prepocessor macros

+code cleanup