cleanup: using commons-lang trim function