Restructure, spacing