Cleaning up commented code