Rename and add more JavaDoc