New wallpaper
Small refactoring