clean up (false && super, underscore prefix for private methods etc)