Added more javadoc comments to util classes and reverted some changes