Perhaps eliminate these extra lines?