Updated cleaner code
 - Added more to the cleaner method and added a timer for checking it
 - Moved around some macros to better places + added some new ones
 - Added back in the DEBUG macro to reduce code size