some code cleaning and tweaks to snow