More refactoring on fitbit_api_helper.