and code should look better-ish now