Updated a few lines following feedback