Issue #2: A little code clean-up