cleaner and builder added
Updated Cleaner