Integrate suggested improvements