cleaning up router class