small changes to make nicer