better labeling
better layout