re-orders type before function.

minor padding changes