nicer coding changes