[ issue #12 ] minor code clean up