db master - changed class names, no problem no more with regex confusion, strips whitespaces