Issue #163: Updating code style