lots of code cleanup,e.g. new disc_function_macros and changed
the disc code's function macros to use appropriate naming convention