Removed uneeded encoder code.  Reformatted.