[CLEANUP] Make the TS look better!