Some rubocop cleanup on my files.
merge again
Task comment and revision cycle