fixing several Code Inspection warnings for issue #13