Clean up a little, add some style