refactor a bit, since this will be a repeating pattern
refactor a bit, since this will be a repeating pattern

--HG--
branch : noink

criswell/noink,criswell/noink,criswell/noink,criswell/noink,criswell/noink