Remove macros, move stuff around and change the name