PEP8 cleanup, fixed documentation + raise bug