Added JavaDoc commenting