Tidy up. Removal of silly methods and added correct generics.