[chore]clean code, make tests pass