Updating based on code review from seanmonstar and fmarier