[StyleGuide] I like this arrangement better