Moved all description to javadoc.
Slight refactoring, now with UA