Implemented changes requested in shopare codereview