Finished refactoring of highest methods