Code cleaning + Background change