Reorganize code for debugging and for init