Addressed issues from comments