pass in navigation function
remove comments
lint fix