Syntax changes, removed unnecessary stuff