#542 nicer layout
#542 words