Remove loader macros and improve docstrings