clean up the semi-colons to make it look less C-like