change declaration syntax
remove `none'
fix notation