Fix Code Inspection issues
#85 #97 Large backup refactoring