Patrick is a jerk

also, I added function names