Non-sprint task - minor cleanup + refactoring: typos resolved + generics added.