some syntax fixes to reduce code complexity
some syntax fixes to reduce code complexity
some syntax fixes to reduce code complexity