cleaned up + leftover rubbish