Doing Intelij recomended fixes

Last Coding session today.