Minor refactoring + started support for boolean comparison decompilation