clean these comments up