changed string literal patterns, modest refactor of class pattern