Cleanup, minor improvements