Cleaned off javadoc comments to make more workable