some clearance
code reorganization