Basic refacturing - code duplication remove