code cleanup: use terniaries