Updates to styling

Signed-off-by: Kulamagal Mahendrarajah <kulamagal@qi-interactive.com>
Removed unwanted variables

Signed-off-by: Kulamagal Mahendrarajah <kulamagal@qi-interactive.com>