minor cleanup and omelette