Clarifications, better structure