Cleaned logging a bit up