I like this change here. It also improves the show code part.