Style issues are resolved - the copy from JABA production release