Removed extraneous print.
Fixed swap and sanitized macro bug.