CASH: code cleaned-up