Cleanup as per chromakode's suggestion