Syntax cleanup

all my's defined consistently, few other small touches
Module cleanup

This was behaving strange.
Quick tidy

error message