Rubocop

do not merge yet, just source for discussion.