Added formating fix and check