Issue #52, edit code style