Cleaning code...
Minor tweaks, cleaning ifaces
Clarified missing state reference in the interface. More cleaning