Addressed feedback from comment #11. Please review