Bhaskar's cleanups

@maddalab these are the smaller cleanups from your PR
@Primer42