Issue #230 - Fixing style