Cleaned up generics