cleaning up that awful macro in favor of a prettier solution :)