Tidying up commented code