Added missing semi colons
Corrected white space and formatting.
Merge branch 'dev' into change_route