Make variables final
Removed strange auto boxing errors
Made variables final
Small code changes