Cleanup, minor changes