Refactoring to reduce complexity
Version bump to 0.2.8