remove unused variables
unwrap line
remove unused variable and simplify code