Cleaning up #41