cleanup code / satisfy rubocop