Minor changes to constants nomenclature
Removed legacy code, added TODOs towards SOLID, added relevant comments
Bugfix for multiple new events, which were false positives on conflict detection