refactor: consolidated methods, grouped convenience methods