Changes based on Steven's comments (Thanks \!)