tidy up code
moved to _junk
moved to _junk