Refactor - Update some comments + unify comments