Design cleanup...
' vs "