Cleaning up the maker. Client function exported