Minor cleanup on config