simplified comment layout and constrained device name length