[TASK] tidy up of first and last