Cleanup code and set header comments