Tidying up

dis looks guuuud now