agreed. cleaned up