Finished refactoring of the compute-oriented methods