Fixed JavaDoc and arguments checking