syntactic clean ups