WICKET-5724 better comment and fix whitespaces