Spacing cleanup and fix a few more missing declaration warnings