Applied more changes suggested by Noem