small payments refactor for better codeclimate
Merge pull request #4058 from Feriority/codeclimate_improvements

small payments refactor for better codeclimate