cleaning up syntax
syntax changes