Clean up less and add config variables