Cleaned up and Clarifications