Code clean up for issue #14