Cleaned up added some lines