cleaning up some architecture