sprucing things a bit