Remove unnecessary extension
Fix line movement by predicate (goWhile)