Made movement methods more organized