Issue #49 coding style fix
Issue #48 coding style fix