code refactoring

1 job for fixup in 2 minutes and 43 seconds