Code cleaning

Javadoc, imports, …