Add comments in header and remove console logs