41 [Code Review] - remove show/edit logic and just show (Joe)