Tidied and refactored to match other images