styling and organization changes