Some cleanup and clarifications