Minor clean up with navigation within the system