removed unnecessary items and added plainer syntax