Slight improvement of calculate logging