Code Review - Comments, Potential Code Refactoring, Typo fixes and Spring Version Bump