fix worked, cleaned it up to be proper