Tidy code per review comments