[#17] Refactor setup