Adding less + cleanup