In work of making code cleaner