cleaned up the code a bit, for our children!