[#45] Simplify code