Good point! I re-factored a bit.