more cleanup, seperation