Code clean up
Add print method for debugging