* Minor reformatting
        * Typo
        * Code clean-up
        * Minor reformatting