code reorganization... Doesn't change much