Simplify code
(#16)