implemented cleaner fix recommended