some syntax improvements