Refactoring and static code analysis fixes