Formatting

Update formatting/ this logic will be updated in the next PR as well