Updated per review comments

Ready to be merged.