cleeeeeean up code