remove confusing var reassignment; simplify default assignment