Made the code simpler to me