Cleaned up some bytes/character mishmash