small organization changes in main