Improvements

Prints what it should and no unused variable