Fixed syntax errorand more clean up