Clarification, comments added and automation