Cleanup, small fix