Minor organization updates, add comments