Bring source layout into line with Go conventions