cosmetic changes. Before main ware-handling logic.