Fix print function and use new var names