Slightly more tidy