code cleanups, added final on variables ++
more cleanups
codestyle fixes...