Small changes to print function