refactor: methods namespace cleanup