refactored, reformatted for pep compliance, version bump