Remove redundant "this." for less clutter
Use generic containers for type safety