Stylized code according rubocop
Finish 1.4.0