Issue 3: move the ugly comment close to the code it talks about
Issue 3: use Jays way of defining the default