Minor changes made to controller and helper class. Nothing noticeable on
the front-end.

Change-Id: I2533a276d7393266ca9079049a10f4079d1543a7