rearrange to my preferred layout for a package
clear wording
set up test cases