Cosmetic changes + data type changed to architecture neutral