cleanup: more golfu shit