Make less faster, fix format bug