refactor(cleanup): more things moved around and simplified