Clean up printing and add update feature