Formatting to Mel's changes in PR and closes #4