cleaning up and commenting