+1 for the simplification.