tidied some shit up