Corrected location, changed presentation, and removed logging