Fixes in formatting