Refactored code analysis. Relates to #94.