add expressions
cleanup ws