Cleanup on aisle 1

Better, quicker, stronger, faster