Some cleanup, made it a bit more formal