Merge "Remove unnecessary constants and improve JavaDoc"