Finished cleaning up the FrameClass