Removed unused import
More comprehensive Javadoc comments