Clean up and commenting