test : clean up (for readability)