Seems like several of these single-line if-blocks were reformatted to always using the block-style. Is that intentional? I tend to like small, single-line if-blocks when there are no else's.