More neatess, refactor test