clean up the syntax more