small code cleanup after commit