chisels reorganization and cleanup