Clean up tags (comments) a bit and I found an unused variable