Cleanup

2 small changes