Improve code style with Rubocop
Improve inline docs