Fix spacing, forward declare order.