refactoring.
errors over warnings (#212).