cleanup, add more sf