Refactor: Simplify boolean expressions in lib/Analysis