Convert to less. Cleanup