Removed commented out bits.
Reformatted view, pushed unpack ops into helper.