I've had to add a missing include and do some formating cleanup.