Simplify signature and add javadocs #530