Refactor code to avoid IDE warnings

3 jobs for develop-80-memory-improvements
in 54 seconds, using 0 compute credits, and was queued for 1 second