removed some extra lines