Remove unused items and add a leto marker
Reformat code and add leto markers