minor refactoring for better formatting
more minor refactoring
version bump