*major* refactoring and *cleanup*