ST: modular and cleaner code.