remove extra lines and small fixes