code cleanpup