Hairbrush the code a bit