Cleaned up and made prettier