syntactical regularization
updates for latest rust