Cleanup, a bit of styling