Small refactoring, wallpaper