refactor(): simplify everything, optimize