Made the code simpler.