Introduce generics
Improved codestyle, added missing @Override annotations, added missing serialVersionUID
Removed unused variables and dead code
Applied codestyle
Ignore warnings