[#13] Changes based on PR comments.