Making things better and removing testing to keep changes small