Cleanup

Minor maintenance stuff