Fixed interwoven nulls problem and reformatted everything