More PEP8 work.
Use current_state instead of current_state_str for comparison to avoid having to deal with host vs service status codes.