annotations moved to separate package
Checkstyle
removed dead code
removed unused parameter
aligned exceptions