Added comments and cleanup to taxi handling