move comments to better position