Update structure and improve clone detection
More restructure
Separate grouping of statements