minor
General cleanup
Added helper for creating keyword pattern