cleaning up stuff as discussed with Ali