cleanup time
changing stuff up