Fixing format issues to master