Cleanup thanks to @ianstormtaylor