Bumped version, minor refactoring.