Shows BYI number if it exists. Also a bit of refactoring.