Apply suggested improvements