[#5] Refactor a little.