Cleanup, slight performance increase