cleanup some syntax