add javaDoc and remove Exceptions