Fix creating of new instances
Fix rubocop issues