analyze: fix indentation
analyze: simplify things