Fix coding and wording