Small code refactoring, no functional change + extra lines between functions ala pep8