Issue #232

Code improvements