#220 - cleanup based on insightful code review comments