Tidy organization
updates
update