modularity between admin/municipal, cleaned up a little