Cleanup some quotes and alignment