Move comments to get picked up by javadoc generator