Following Phobos style guide more closely