Changes made per Matt's stupid comments