refactor(review & comment) cleanup code