tidy up/consistency