cleanig up code