Formatted better