Cleanup
Improved Javadoc and assertion messages