checkstyle and code refactor for enterprise