added #ifdefs to don't affect the Release build, also code indentation changes