Clean up and address #448