Simplify the coding. Doh!