[DR] Remove DR code smells - additional