Addressing issue #1
Refactored to use object literal