Conversion of 4 spaces to 2 spaces.
Update deps. Refactor.