Cleanup: minor cleanup