check boolean & cleanup logging