508->466

Little bit refactor.
Hello from YAPC. :-)