Addressed comments
Integrated suggestions by Mark - Thank you