Some code refactoring.
+ Artist basement