Small Code Smell Fixes