Small code clearnups are done