Improving my last terrible post