better organization, fewer includes