refactor: simplify code
remove viewDidUnload call (deprecated)
minor fix