some refactor, error page