got rid of unnecessary lines
Merge I think
One day this thing will work for me