Housekeeping on code

Minor modifications