Better method names and provided javadocs