Some cleanup, remove 1.7 style generics, move method