#30 - removed persist analysis checkbox + a lot of refactoring