Cleaned and updated macros folder