finished with conditionals cleanup