Cleanup,  + comments on tests