Clean up less, add comments