re-structuring and minor edits