Removed record and fixed 1 if bug

We didn't really use the record in such a way that it was needed. Currently a map is all we need.