Structured code a bit better.