#49 remove unused class + modify visibility + add final statements