code reorganization for last commit