More minor crud cleanup