Style suggestions

Several style suggestions for you to consider.