Changed logging format for console (now includes origin of message)