Better fit to yourls coding standards