toString() method optimization (?)
Merge branch 'master' into library-service
imports cleanup