Cleanup & switched to less
Cleanup & switched to less