cleanup and more styling