2013-12-01 minor refactoring