Cleanup based on Sonar findings; code reindent/reformat; organize imports