Clean up and made prettier