removing dead code
moving interpolated strings into class body