PEP8 clean-up, refactored the error bar handling.