Cleanup

Cast from uint to int16_t.