Cleaned up logging
Logger improvements