More clean ups
Some fun with styling...