Rework and cleanup SevenCommonsWrapper
Javadocs