LATSD/TASK29: Minor style fixes

Minor style fixes, ready to intagrate real data