Minor modifications to fit coding rules