minor golfing changes