Added remaining suggestions that I accepted