Replacing (noir.session/put! x nil) w/ (noir.session/remove! x)
Simplify code a bit
Merge pull request #4 from DNNX/master

A couple of minor refactorings