Code clean up for Wicketstuff integration