Fixing maven problems and comments in classes