General tidying in Frames.
Merge pull request #179 from greboid/tidying

General tidying in Frames.