code cleanup based on Rubocop run on app directory