Refactor code

3 jobs for develop-80-memory-improvements
in 37 seconds, using 0 compute credits, and was queued for 2 seconds