streamline <3
code tidying up