Code reformat and JDoc fixes