Re-structure and better pointing