Moved logging to smallest method