#49 Change name to cleaner