Refactoring for less complex codebase
Version bump to 0.2.4