Code base clean up

- Changed vars to appropriate types in controllers, data, resources and
web projects.