Refactor and made image slighly smaller