Patch 9

small code cleanup