Cleaned up and made it pretty!