source cleaned up