refactor: major code update to zeitgeist patterns