Clarifications/cleanup