Clean up some more. still functional
Clean up some more. still functional