Cleanup logging
Quote some variables