remove cleaner
cosmetic
refactor a bit