Do some cleanup and clarifications