Syntax change and remove superfluous code