More formatting and consistency fixes

formatting was correct here before.