Added commons-lang, better styles for comments