Some reworking, cleaning the mess