Minor update for readability and options