Making it close and stuff better. Removing cruft. Thnx @seutje