REFACTORING: declare a lot of variables as const, change macros