Major clean up since I haven't commited in forever.