Code refactoring to improve scrutinizer score.