Code cleanup and some extras for CardboardMessage