Cleaning to make it a bit clearer where to put to options