Minor formatting fix
Refactored ugly first attempt at LDS