Style fixes, agree with these two, inconsistencies with the remaining ones.