OCD organization changes
adds comments