STY: Cleaning up