Adding JavaDoc, and cleanup some mess