re organize code