Utilize Generics better
Formatting.