fix(demo): Shorten remaining(), add return type annotations