slight organization changes