Updating logging to be less messy and provide more info