formatting consistency and build warning fixes