Updates via feedback

Made slight changes due to feedback.