cleanup & changing variables