refactor
minor editing