Improve show method