Code clean up

- Changed vars to appropriate types.