Reformat to Wicket coding styles
Extract inner classes to normal ones for easier reading