Cleaning and reworking API