fixed syntax / clean up