[cleanup] Improved comments and constant field names, fixed checkstyle error