add syntax cleanup