Some cleanup using pure now