edit header and clean code