Some small code prettifies have been done