Simpify code more.