Minor code cleanup in engi tool