Refactored code analysis issues. Relates to #93.