code cleanup thanks to eiffeldoc
more cleanup