Clean up code Okay, this is probably cleaner and it is also less net change from the original version
2012-08-12T11:53:58