restructuring
some syntaxes