Few more changes related to local formatting