Clean up

Cleaned up some code and changed FrameDesc to include byte[]
information.