Issue #8 Fixed style violations according to remarks