Cleanig and commenting