Updates comments & refactors