Cleaned up macros
Cleaned up code
Cleaned up code and added finalization message