Minor updates
Cleanups and clarifications