Fixed issue with null value for status, reformatted