heroku code refactorying 6