Addressed duplicated code warning from Jenkins