clean code slightly.