refactor: code cleanup, introduce generics
1 file changed