STY: Cleaning up code