Change syntax and refactory