Moved logs for better readability