Cleaning up a tad for SO