Structural changes for readability sake