Cleanup and commenting