Code base clean up

- Changed vars to appropriate types in components project.