Cleaned up some generics