Additional refactoring of frame and final frame methods