Cleanup names and hard-code byte array