STK DSDS - Cleaner code