Update velvet setup
Update formating