updates(refactor): Refactored stuff