Clean up, spelling