refactor, organize cold