Navigation done. Code clean up.