Remove space
Don't load images twice