#240 Code style
#240 Simplify code