more styling and clenaup