cleaning up randoms
didnt change much yet but it is ok