Addressed some issues from feedback