Improve first exercise