PIM-1526 : Increase Code Quality

Bug fix: [no]
Feature addition: [no]
Backwards compatibility break: [no]
Unit test passes: [yes]
Behat scenarios passes: [yes]
Checkstyle issues: [no]*
ChangeLog updated: [no]
Fixes the following jira:
 - PIM-1526