tidied up for new macbook