please rubocop + cleanup