Text shadowing and minor refactoring