Converting to less
Cleanup