#56 code cleanup